We're a gobject, not a GtkObject. Thanks andersca.

Tue Oct  9 17:40:24 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreestore.c (gtk_tree_store_finalize): We're a gobject,
	not a GtkObject.  Thanks andersca.

	* gtk/gtkliststore.c (gtk_list_store_finalize): ditto

diff --git a/ChangeLog b/ChangeLog
index 5f5cc8a0d63ddbc63c02d00ebea6ad0670efaaf1..a94f0043264f5e27b598c2cfd1b9d51e13082ede 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Oct  9 17:40:24 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_finalize): We're a gobject,
+       not a GtkObject.  Thanks andersca.
+
+       * gtk/gtkliststore.c (gtk_list_store_finalize): ditto
+
 Tue Oct  9 14:50:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5f5cc8a0d63ddbc63c02d00ebea6ad0670efaaf1..a94f0043264f5e27b598c2cfd1b9d51e13082ede 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Oct  9 17:40:24 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_finalize): We're a gobject,
+       not a GtkObject.  Thanks andersca.
+
+       * gtk/gtkliststore.c (gtk_list_store_finalize): ditto
+
 Tue Oct  9 14:50:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5f5cc8a0d63ddbc63c02d00ebea6ad0670efaaf1..a94f0043264f5e27b598c2cfd1b9d51e13082ede 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Oct  9 17:40:24 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_finalize): We're a gobject,
+       not a GtkObject.  Thanks andersca.
+
+       * gtk/gtkliststore.c (gtk_list_store_finalize): ditto
+
 Tue Oct  9 14:50:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5f5cc8a0d63ddbc63c02d00ebea6ad0670efaaf1..a94f0043264f5e27b598c2cfd1b9d51e13082ede 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Oct  9 17:40:24 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_finalize): We're a gobject,
+       not a GtkObject.  Thanks andersca.
+
+       * gtk/gtkliststore.c (gtk_list_store_finalize): ditto
+
 Tue Oct  9 14:50:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5f5cc8a0d63ddbc63c02d00ebea6ad0670efaaf1..a94f0043264f5e27b598c2cfd1b9d51e13082ede 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Oct  9 17:40:24 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_finalize): We're a gobject,
+       not a GtkObject.  Thanks andersca.
+
+       * gtk/gtkliststore.c (gtk_list_store_finalize): ditto
+
 Tue Oct  9 14:50:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5f5cc8a0d63ddbc63c02d00ebea6ad0670efaaf1..a94f0043264f5e27b598c2cfd1b9d51e13082ede 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Oct  9 17:40:24 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_finalize): We're a gobject,
+       not a GtkObject.  Thanks andersca.
+
+       * gtk/gtkliststore.c (gtk_list_store_finalize): ditto
+
 Tue Oct  9 14:50:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5f5cc8a0d63ddbc63c02d00ebea6ad0670efaaf1..a94f0043264f5e27b598c2cfd1b9d51e13082ede 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Oct  9 17:40:24 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreestore.c (gtk_tree_store_finalize): We're a gobject,
+       not a GtkObject.  Thanks andersca.
+
+       * gtk/gtkliststore.c (gtk_list_store_finalize): ditto
+
 Tue Oct  9 14:50:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index c7d79c5b899f16adf194ad4dca7253b7a76d61f5..01861e222a617c4c5283dadb9cd2d7408835b61a 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -35,7 +35,6 @@ static void         gtk_list_store_tree_model_init (GtkTreeModelIface *iface);
 static void         gtk_list_store_drag_source_init(GtkTreeDragSourceIface *iface);
 static void         gtk_list_store_drag_dest_init  (GtkTreeDragDestIface   *iface);
 static void         gtk_list_store_sortable_init   (GtkTreeSortableIface   *iface);
-static void         gtk_list_store_destroy         (GtkObject         *gobject);
 static void         gtk_list_store_finalize        (GObject           *object);
 static guint        gtk_list_store_get_flags       (GtkTreeModel      *tree_model);
 static gint         gtk_list_store_get_n_columns   (GtkTreeModel      *tree_model);
@@ -113,6 +112,8 @@ static void     gtk_list_store_set_default_sort_func (GtkTreeSortable        *so
 static gboolean gtk_list_store_has_default_sort_func (GtkTreeSortable        *sortable);
 
 
+static GObjectClass *parent_class = NULL;
+
 
 static void
 validate_list_store (GtkListStore *list_store)
@@ -195,13 +196,11 @@ static void
 gtk_list_store_class_init (GtkListStoreClass *class)
 {
   GObjectClass *object_class;
-  GtkObjectClass *gobject_class;
 
+  parent_class = g_type_class_peek_parent (class);
   object_class = (GObjectClass*) class;
-  gobject_class = (GtkObjectClass*) class;
 
   object_class->finalize = gtk_list_store_finalize;
-  gobject_class->destroy = gtk_list_store_destroy;
 }
 
 static void
@@ -396,19 +395,14 @@ gtk_list_store_finalize (GObject *object)
   _gtk_tree_data_list_header_free (list_store->sort_list);
   g_free (list_store->column_headers);
   
-}
-
-static void
-gtk_list_store_destroy (GtkObject *gobject)
-{
-  GtkListStore *list_store = GTK_LIST_STORE (gobject);
-
   if (list_store->default_sort_destroy)
     {
       (* list_store->default_sort_destroy) (list_store->default_sort_data);
       list_store->default_sort_destroy = NULL;
       list_store->default_sort_data = NULL;
     }
+
+  (* parent_class->finalize) (object);
 }
 
 /* Fulfill the GtkTreeModel requirements */

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 632dbbb65efce3b6e43207c4ed95eb5d4eafe9fe..7a0aabc8838408ffebde8e2a71e0a9d95a1f7108 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -35,7 +35,6 @@ static void         gtk_tree_store_drag_source_init(GtkTreeDragSourceIface *ifac
 static void         gtk_tree_store_drag_dest_init  (GtkTreeDragDestIface   *iface);
 static void         gtk_tree_store_sortable_init   (GtkTreeSortableIface   *iface);
 static void         gtk_tree_store_finalize        (GObject           *object);
-static void         gtk_tree_store_destroy         (GtkObject         *object);
 static guint        gtk_tree_store_get_flags       (GtkTreeModel      *tree_model);
 static gint         gtk_tree_store_get_n_columns   (GtkTreeModel      *tree_model);
 static GType        gtk_tree_store_get_column_type (GtkTreeModel      *tree_model,
@@ -111,7 +110,11 @@ static void     gtk_tree_store_set_default_sort_func   (GtkTreeSortable        *
                                                        GtkDestroyNotify        destroy);
 static gboolean gtk_tree_store_has_default_sort_func   (GtkTreeSortable        *sortable);
 
-static void     validate_gnode                    (GNode *node);
+static void     validate_gnode                         (GNode *node);
+
+
+static GObjectClass *parent_class = NULL;
+
 
 static inline void
 validate_tree (GtkTreeStore *tree_store)
@@ -193,16 +196,14 @@ gtk_tree_store_get_type (void)
 }
 
 static void
-gtk_tree_store_class_init (GtkTreeStoreClass *tree_store_class)
+gtk_tree_store_class_init (GtkTreeStoreClass *class)
 {
   GObjectClass *object_class;
-  GtkObjectClass *gobject_class;
 
-  object_class = (GObjectClass *) tree_store_class;
-  gobject_class = (GtkObjectClass *) tree_store_class;
+  parent_class = g_type_class_peek_parent (class);
+  object_class = (GObjectClass *) class;
 
   object_class->finalize = gtk_tree_store_finalize;
-  gobject_class->destroy = gtk_tree_store_destroy;
 }
 
 static void
@@ -409,12 +410,6 @@ gtk_tree_store_finalize (GObject *object)
   g_node_children_foreach (tree_store->root, G_TRAVERSE_LEAFS, node_free, tree_store->column_headers);
   _gtk_tree_data_list_header_free (tree_store->sort_list);
   g_free (tree_store->column_headers);
-}
-
-static void
-gtk_tree_store_destroy (GtkObject *gobject)
-{
-  GtkTreeStore *tree_store = GTK_TREE_STORE (gobject);
 
   if (tree_store->default_sort_destroy)
     {
@@ -422,6 +417,8 @@ gtk_tree_store_destroy (GtkObject *gobject)
       tree_store->default_sort_destroy = NULL;
       tree_store->default_sort_data = NULL;
     }
+
+  (* parent_class->finalize) (object);
 }
 
 /* fulfill the GtkTreeModel requirements */